From e62e140daa393c89342f7ca19906e303ebedf8db Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Fri, 6 Apr 2018 18:56:42 +0100 Subject: [PATCH] x86/ioreq: Fix build from a collision of c/s f46b61973 and c/s 6e387461ed Drop the _mfn() wrappers now that page_to_mfn() returns the correct type. Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant Release-acked-by: Juergen Gross --- xen/arch/x86/hvm/ioreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/ioreq.c b/xen/arch/x86/hvm/ioreq.c index 3a201f5563..905132980f 100644 --- a/xen/arch/x86/hvm/ioreq.c +++ b/xen/arch/x86/hvm/ioreq.c @@ -973,12 +973,12 @@ int hvm_get_ioreq_server_frame(struct domain *d, ioservid_t id, if ( !HANDLE_BUFIOREQ(s) ) goto out; - *mfn = _mfn(page_to_mfn(s->bufioreq.page)); + *mfn = page_to_mfn(s->bufioreq.page); rc = 0; break; case XENMEM_resource_ioreq_server_frame_ioreq(0): - *mfn = _mfn(page_to_mfn(s->ioreq.page)); + *mfn = page_to_mfn(s->ioreq.page); rc = 0; break; -- 2.30.2